Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor correction release 2.2.0.post [rebase & merge] #19450

Merged
merged 8 commits into from
Feb 12, 2024
Merged

Minor correction release 2.2.0.post [rebase & merge] #19450

merged 8 commits into from
Feb 12, 2024

Conversation

Borda
Copy link
Member

@Borda Borda commented Feb 12, 2024 •
edited by github-actions bot
Loading

(cherry picked from commit ac9d63f)## What does this PR do?

need to land #19440 and #19442

Before submitting
  • Was this discussed/agreed via a GitHub issue? (not for typos and docs)
  • Did you read the contributor guideline, Pull Request section?
  • Did you make sure your PR does only one thing, instead of bundling different changes together?
  • Did you make sure to update the documentation with your changes? (if necessary)
  • Did you write any new necessary tests? (not for typos and docs)
  • Did you verify new and existing tests pass locally with your changes?
  • Did you list all the breaking changes introduced by this pull request?
  • Did you update the CHANGELOG? (not for typos, docs, test updates, or minor internal changes/refactors)

PR review

Anyone in the community is welcome to review the PR.
Before you start reviewing, make sure you have read the review guidelines. In short, see the following bullet-list:

Reviewer checklist
  • Is this pull request ready for review? (if not, please submit in draft mode)
  • Check that all items from Before submitting are resolved
  • Make sure the title is self-explanatory and the description concisely explains the PR
  • Add labels and milestones (and optionally projects) to the PR so it can be classified

(cherry picked from commit ac9d63f)

cc @Borda @carmocca @justusschock @awaelchli

tchaton and others added 6 commits February 12, 2024 11:25
@tchaton @Borda
Lightning Data: Refactor files (#19424)
2e36719 
(cherry picked from commit ac9d63f)
@tchaton @Borda
Add DNS optimize support (#19429)
e30d787 
* update

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* update

* update

* update

* update

* update

* update

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: thomas <[email protected]>
(cherry picked from commit 4c2fc3b)
@awaelchli @Borda
Fix import error when running examples in fresh environment (#19431)
baf8989 
(cherry picked from commit 5aea3b1)
@cauyxy @Borda
bugfix: correct node rank (#19437)
a90fec9 
(cherry picked from commit 7b867c7)
@justusschock @Borda
Rename Lightning App CLI (#19440)
a766069 
(cherry picked from commit 0acd5f9)
@cauyxy @Borda
bugfix: skip write index.json if no data is wrote. (#19439)
f9c06b9 
(cherry picked from commit 47c8f4c)
@Borda Borda added the release label Feb 12, 2024
@Borda Borda added this to the 2.2.x milestone Feb 12, 2024
@github-actions github-actions bot added docs Documentation related ci Continuous Integration app (removed) Generic label for Lightning App package pl Generic label for PyTorch Lightning package dependencies Pull requests that update a dependency file package data (external) litdata package labels Feb 12, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 12, 2024 •
edited
Loading

⚡ Required checks status: All passing 🟢

Groups summary

🟢 pytorch_lightning: Tests workflow
Check ID Status
pl-cpu (macOS-11, lightning, 3.8, 1.13, oldest) success ✅
pl-cpu (macOS-11, lightning, 3.10, 1.13) success ✅
pl-cpu (macOS-11, lightning, 3.10, 2.1) success ✅
pl-cpu (ubuntu-20.04, lightning, 3.8, 1.13, oldest) success ✅
pl-cpu (ubuntu-20.04, lightning, 3.10, 1.13) success ✅
pl-cpu (ubuntu-20.04, lightning, 3.10, 2.1) success ✅
pl-cpu (windows-2022, lightning, 3.8, 1.13, oldest) success ✅
pl-cpu (windows-2022, lightning, 3.10, 1.13) success ✅
pl-cpu (windows-2022, lightning, 3.10, 2.1) success ✅
pl-cpu (macOS-11, pytorch, 3.8, 1.13) success ✅
pl-cpu (ubuntu-20.04, pytorch, 3.8, 1.13) success ✅
pl-cpu (windows-2022, pytorch, 3.8, 1.13) success ✅
pl-cpu (macOS-12, pytorch, 3.11, 2.0) success ✅
pl-cpu (macOS-12, pytorch, 3.11, 2.1) success ✅
pl-cpu (ubuntu-22.04, pytorch, 3.11, 2.0) success ✅
pl-cpu (ubuntu-22.04, pytorch, 3.11, 2.1) success ✅
pl-cpu (windows-2022, pytorch, 3.11, 2.0) success ✅
pl-cpu (windows-2022, pytorch, 3.11, 2.1) success ✅

These checks are required after the changes to src/lightning/fabric/cli.py, src/lightning_fabric/__setup__.py, requirements/pytorch/examples.txt, src/lightning/pytorch/demos/transformer.py.

🟢 pytorch_lightning: Azure GPU
Check ID Status
pytorch-lightning (GPUs) (testing Lightning | latest) success ✅
pytorch-lightning (GPUs) (testing PyTorch | latest) success ✅

These checks are required after the changes to requirements/pytorch/examples.txt, src/lightning/__setup__.py, src/lightning/pytorch/demos/transformer.py, src/lightning/fabric/cli.py, src/lightning_fabric/__setup__.py.

🟢 pytorch_lightning: Benchmarks
Check ID Status
lightning.Benchmarks success ✅

These checks are required after the changes to requirements/pytorch/examples.txt, src/lightning/fabric/cli.py, src/lightning/pytorch/demos/transformer.py.

🟢 fabric: Docs
Check ID Status
docs-make (fabric, doctest) success ✅
docs-make (fabric, html) success ✅

These checks are required after the changes to src/lightning/fabric/cli.py, src/lightning_fabric/__setup__.py, docs/source-fabric/fundamentals/launch.rst.

🟢 pytorch_lightning: Docs
Check ID Status
docs-make (pytorch, doctest) success ✅
docs-make (pytorch, html) success ✅

These checks are required after the changes to src/lightning/pytorch/demos/transformer.py, requirements/pytorch/examples.txt.

🟢 pytorch_lightning: Docker
Check ID Status
build-cuda (3.9, 1.13, 11.8.0) success ✅
build-cuda (3.9, 1.13, 12.0.1) success ✅
build-cuda (3.10, 2.0, 11.8.0) success ✅
build-cuda (3.10, 2.1, 12.1.0) success ✅
build-pl (3.9, 1.13, 11.8.0) success ✅
build-pl (3.9, 1.13, 12.0.1) success ✅
build-pl (3.10, 2.0, 11.8.0) success ✅
build-pl (3.10, 2.1, 12.1.0) success ✅

These checks are required after the changes to requirements/pytorch/examples.txt.

🟢 lightning_data: CPU workflow
Check ID Status
data-cpu (macOS-11, lightning, 3.10, 2.1) success ✅
data-cpu (ubuntu-20.04, lightning, 3.10, 2.1) success ✅
data-cpu (windows-2022, lightning, 3.10, 2.1) success ✅

These checks are required after the changes to src/lightning/data/__init__.py, src/lightning/data/constants.py, src/lightning/data/processing/data_processor.py, src/lightning/data/processing/dns.py, src/lightning/data/processing/functions.py, src/lightning/data/processing/readers.py, src/lightning/data/streaming/__init__.py, src/lightning/data/streaming/cache.py, src/lightning/data/streaming/client.py, src/lightning/data/streaming/config.py, src/lightning/data/streaming/dataloader.py, src/lightning/data/streaming/dataset.py, src/lightning/data/streaming/downloader.py, src/lightning/data/streaming/item_loader.py, src/lightning/data/streaming/reader.py, src/lightning/data/streaming/serializers.py, src/lightning/data/streaming/shuffle.py, src/lightning/data/streaming/writer.py, src/lightning/data/utilities/shuffle.py, src/lightning/__setup__.py, tests/tests_data/processing/test_data_processor.py, tests/tests_data/processing/test_dns.py, tests/tests_data/processing/test_functions.py, tests/tests_data/streaming/test_dataset.py, tests/tests_data/utilities/test_shuffle.py.

🟢 lightning_fabric: CPU workflow
Check ID Status
fabric-cpu (macOS-11, lightning, 3.8, 1.13, oldest) success ✅
fabric-cpu (macOS-11, lightning, 3.10, 1.13) success ✅
fabric-cpu (macOS-11, lightning, 3.11, 2.1) success ✅
fabric-cpu (ubuntu-20.04, lightning, 3.8, 1.13, oldest) success ✅
fabric-cpu (ubuntu-20.04, lightning, 3.10, 1.13) success ✅
fabric-cpu (ubuntu-20.04, lightning, 3.11, 2.1) success ✅
fabric-cpu (windows-2022, lightning, 3.8, 1.13, oldest) success ✅
fabric-cpu (windows-2022, lightning, 3.10, 1.13) success ✅
fabric-cpu (windows-2022, lightning, 3.11, 2.1) success ✅
fabric-cpu (macOS-11, fabric, 3.8, 1.13) success ✅
fabric-cpu (ubuntu-20.04, fabric, 3.8, 1.13) success ✅
fabric-cpu (windows-2022, fabric, 3.8, 1.13) success ✅
fabric-cpu (macOS-12, fabric, 3.11, 2.0) success ✅
fabric-cpu (macOS-12, fabric, 3.11, 2.1) success ✅
fabric-cpu (ubuntu-22.04, fabric, 3.11, 2.0) success ✅
fabric-cpu (ubuntu-22.04, fabric, 3.11, 2.1) success ✅
fabric-cpu (windows-2022, fabric, 3.11, 2.0) success ✅
fabric-cpu (windows-2022, fabric, 3.11, 2.1) success ✅

These checks are required after the changes to src/lightning/fabric/cli.py, src/lightning_fabric/__setup__.py, tests/tests_fabric/test_cli.py.

🟢 lightning_fabric: Azure GPU
Check ID Status
lightning-fabric (GPUs) (testing Fabric | latest) success ✅
lightning-fabric (GPUs) (testing Lightning | latest) success ✅

These checks are required after the changes to src/lightning/__setup__.py, src/lightning/fabric/cli.py, src/lightning_fabric/__setup__.py, tests/tests_fabric/test_cli.py.

🟢 lightning_app: Tests workflow
Check ID Status
app-pytest (macOS-11, lightning, 3.8, latest) success ✅
app-pytest (macOS-11, lightning, 3.8, oldest) success ✅
app-pytest (macOS-11, app, 3.9, latest) success ✅
app-pytest (macOS-12, app, 3.11, latest) success ✅
app-pytest (ubuntu-20.04, lightning, 3.8, latest) success ✅
app-pytest (ubuntu-20.04, lightning, 3.8, oldest) success ✅
app-pytest (ubuntu-20.04, app, 3.9, latest) success ✅
app-pytest (ubuntu-22.04, app, 3.11, latest) success ✅
app-pytest (windows-2022, lightning, 3.8, latest) success ✅
app-pytest (windows-2022, lightning, 3.8, oldest) success ✅
app-pytest (windows-2022, app, 3.8, latest) success ✅
app-pytest (windows-2022, app, 3.11, latest) success ✅

These checks are required after the changes to src/lightning/app/cli/cmd_react_ui_init.py, src/lightning/app/cli/commands/app_commands.py, src/lightning/app/cli/commands/ls.py, src/lightning/app/cli/component-template/setup.py, src/lightning/app/cli/connect/app.py, src/lightning/app/cli/lightning_cli.py, src/lightning/app/core/flow.py, src/lightning/app/runners/cloud.py, src/lightning/app/testing/testing.py, src/lightning/app/utilities/load_app.py, src/lightning/app/utilities/login.py, src/lightning_app/__setup__.py, tests/tests_app/cli/test_cli.py, tests/tests_app/cli/test_cmd_react_ui_init.py, tests/tests_app/cli/test_connect.py, tests/tests_app/runners/test_cloud.py, tests/tests_app/utilities/test_safe_pickle.py.

🟢 lightning_app: Examples
Check ID Status
app-examples (macOS-11, lightning, 3.9, latest) success ✅
app-examples (macOS-11, lightning, 3.9, oldest) success ✅
app-examples (macOS-11, app, 3.9, latest) success ✅
app-examples (ubuntu-20.04, lightning, 3.9, latest) success ✅
app-examples (ubuntu-20.04, lightning, 3.9, oldest) success ✅
app-examples (ubuntu-20.04, app, 3.9, latest) success ✅
app-examples (windows-2022, lightning, 3.9, latest) success ✅
app-examples (windows-2022, lightning, 3.9, oldest) success ✅
app-examples (windows-2022, app, 3.9, latest) success ✅

These checks are required after the changes to src/lightning/app/cli/cmd_react_ui_init.py, src/lightning/app/cli/commands/app_commands.py, src/lightning/app/cli/commands/ls.py, src/lightning/app/cli/component-template/setup.py, src/lightning/app/cli/connect/app.py, src/lightning/app/cli/lightning_cli.py, src/lightning/app/core/flow.py, src/lightning/app/runners/cloud.py, src/lightning/app/testing/testing.py, src/lightning/app/utilities/load_app.py, src/lightning/app/utilities/login.py, src/lightning_app/__setup__.py.

🟢 lightning: Store
Check ID Status
store-cpu (macOS-11, lightning, 3.10, 2.0) success ✅
store-cpu (ubuntu-20.04, lightning, 3.10, 2.0) success ✅
store-cpu (windows-2022, lightning, 3.10, 2.0) success ✅

These checks are required after the changes to src/lightning/__setup__.py.

🟢 lightning_app: Docs
Check ID Status
docs-make (app, doctest) success ✅
docs-make (app, html) success ✅

These checks are required after the changes to src/lightning/app/cli/cmd_react_ui_init.py, src/lightning/app/cli/commands/app_commands.py, src/lightning/app/cli/commands/ls.py, src/lightning/app/cli/component-template/setup.py, src/lightning/app/cli/connect/app.py, src/lightning/app/cli/lightning_cli.py, src/lightning/app/core/flow.py, src/lightning/app/runners/cloud.py, src/lightning/app/testing/testing.py, src/lightning/app/utilities/load_app.py, src/lightning/app/utilities/login.py, src/lightning_app/__setup__.py, docs/source-app/basics.rst, docs/source-app/get_started/go_beyond_training_content.rst, docs/source-app/get_started/jumpstart_from_app_gallery.rst, docs/source-app/get_started/training_with_apps.rst, docs/source-app/glossary/command_lines/command_lines.rst, docs/source-app/glossary/environment_variables.rst, docs/source-app/glossary/secrets.rst, docs/source-app/glossary/use_local_lightning.rst, docs/source-app/landing_app_run.bash, docs/source-app/levels/basic/hello_components/code_run_cloud.bash, docs/source-app/levels/basic/hello_components/code_run_cloud_setup.bash, docs/source-app/levels/basic/hello_components/code_run_local.bash, docs/source-app/levels/basic/hello_components/code_run_local_setup.bash, docs/source-app/workflows/add_server/any_server.rst, docs/source-app/workflows/add_web_ui/justpy/index.rst, docs/source-app/workflows/add_web_ui/panel/basic.rst, docs/source-app/workflows/add_web_ui/react/connect_react_and_lightning.rst, docs/source-app/workflows/build_command_line_interface/cli.rst, docs/source-app/workflows/build_command_line_interface/cli_client.rst, docs/source-app/workflows/build_command_line_interface/index.rst, docs/source-app/workflows/build_lightning_app/from_pytorch_lightning_script.rst, docs/source-app/workflows/build_lightning_app/from_scratch_content.rst, docs/source-app/workflows/build_lightning_component/from_scratch_component_content.rst, docs/source-app/workflows/build_rest_api/add_api.rst, docs/source-app/workflows/run_app_on_cloud/lightning_cloud.rst, docs/source-app/workflows/run_app_snippet.rst.

🟢 mypy
Check ID Status
mypy success ✅

These checks are required after the changes to requirements/pytorch/examples.txt, src/lightning/__setup__.py, src/lightning/app/cli/cmd_react_ui_init.py, src/lightning/app/cli/commands/app_commands.py, src/lightning/app/cli/commands/ls.py, src/lightning/app/cli/component-template/setup.py, src/lightning/app/cli/connect/app.py, src/lightning/app/cli/lightning_cli.py, src/lightning/app/core/flow.py, src/lightning/app/runners/cloud.py, src/lightning/app/testing/testing.py, src/lightning/app/utilities/load_app.py, src/lightning/app/utilities/login.py, src/lightning/data/__init__.py, src/lightning/data/constants.py, src/lightning/data/processing/data_processor.py, src/lightning/data/processing/dns.py, src/lightning/data/processing/functions.py, src/lightning/data/processing/readers.py, src/lightning/data/streaming/__init__.py, src/lightning/data/streaming/cache.py, src/lightning/data/streaming/client.py, src/lightning/data/streaming/config.py, src/lightning/data/streaming/dataloader.py, src/lightning/data/streaming/dataset.py, src/lightning/data/streaming/downloader.py, src/lightning/data/streaming/item_loader.py, src/lightning/data/streaming/reader.py, src/lightning/data/streaming/serializers.py, src/lightning/data/streaming/shuffle.py, src/lightning/data/streaming/writer.py, src/lightning/data/utilities/shuffle.py, src/lightning/fabric/cli.py, src/lightning/pytorch/demos/transformer.py, src/lightning_app/__setup__.py, src/lightning_fabric/__setup__.py, src/version.info.

🟢 install
Check ID Status
install-pkg (ubuntu-22.04, app, 3.8) success ✅
install-pkg (ubuntu-22.04, app, 3.11) success ✅
install-pkg (ubuntu-22.04, fabric, 3.8) success ✅
install-pkg (ubuntu-22.04, fabric, 3.11) success ✅
install-pkg (ubuntu-22.04, pytorch, 3.8) success ✅
install-pkg (ubuntu-22.04, pytorch, 3.11) success ✅
install-pkg (ubuntu-22.04, lightning, 3.8) success ✅
install-pkg (ubuntu-22.04, lightning, 3.11) success ✅
install-pkg (ubuntu-22.04, notset, 3.8) success ✅
install-pkg (ubuntu-22.04, notset, 3.11) success ✅
install-pkg (macOS-12, app, 3.8) success ✅
install-pkg (macOS-12, app, 3.11) success ✅
install-pkg (macOS-12, fabric, 3.8) success ✅
install-pkg (macOS-12, fabric, 3.11) success ✅
install-pkg (macOS-12, pytorch, 3.8) success ✅
install-pkg (macOS-12, pytorch, 3.11) success ✅
install-pkg (macOS-12, lightning, 3.8) success ✅
install-pkg (macOS-12, lightning, 3.11) success ✅
install-pkg (macOS-12, notset, 3.8) success ✅
install-pkg (macOS-12, notset, 3.11) success ✅
install-pkg (windows-2022, app, 3.8) success ✅
install-pkg (windows-2022, app, 3.11) success ✅
install-pkg (windows-2022, fabric, 3.8) success ✅
install-pkg (windows-2022, fabric, 3.11) success ✅
install-pkg (windows-2022, pytorch, 3.8) success ✅
install-pkg (windows-2022, pytorch, 3.11) success ✅
install-pkg (windows-2022, lightning, 3.8) success ✅
install-pkg (windows-2022, lightning, 3.11) success ✅
install-pkg (windows-2022, notset, 3.8) success ✅
install-pkg (windows-2022, notset, 3.11) success ✅

These checks are required after the changes to .github/workflows/ci-pkg-install.yml, src/lightning/__setup__.py, src/lightning/app/cli/cmd_react_ui_init.py, src/lightning/app/cli/commands/app_commands.py, src/lightning/app/cli/commands/ls.py, src/lightning/app/cli/component-template/setup.py, src/lightning/app/cli/connect/app.py, src/lightning/app/cli/lightning_cli.py, src/lightning/app/core/flow.py, src/lightning/app/runners/cloud.py, src/lightning/app/testing/testing.py, src/lightning/app/utilities/load_app.py, src/lightning/app/utilities/login.py, src/lightning/data/__init__.py, src/lightning/data/constants.py, src/lightning/data/processing/data_processor.py, src/lightning/data/processing/dns.py, src/lightning/data/processing/functions.py, src/lightning/data/processing/readers.py, src/lightning/data/streaming/__init__.py, src/lightning/data/streaming/cache.py, src/lightning/data/streaming/client.py, src/lightning/data/streaming/config.py, src/lightning/data/streaming/dataloader.py, src/lightning/data/streaming/dataset.py, src/lightning/data/streaming/downloader.py, src/lightning/data/streaming/item_loader.py, src/lightning/data/streaming/reader.py, src/lightning/data/streaming/serializers.py, src/lightning/data/streaming/shuffle.py, src/lightning/data/streaming/writer.py, src/lightning/data/utilities/shuffle.py, src/lightning/fabric/cli.py, src/lightning/pytorch/demos/transformer.py, src/lightning_app/__setup__.py, src/lightning_fabric/__setup__.py, src/version.info, requirements/pytorch/examples.txt.

Thank you for your contribution! 💜

Note
This comment is automatically generated and updates for 60 minutes every 180 seconds. If you have any other questions, contact carmocca for help.

@codecov Codecov
Copy link

codecov bot commented Feb 12, 2024 •
edited
Loading

Codecov Report

Merging #19450 (6e86937) into release/stable (8aad87e) will decrease coverage by 0%.
The diff coverage is 77%.

Additional details and impacted files 
@@               Coverage Diff               @@
##           release/stable   #19450   +/-   ##
===============================================
- Coverage              83%      83%   -0%     
===============================================
  Files                 450      452    +2     
  Lines               38072    38136   +64     
===============================================
+ Hits                31660    31698   +38     
- Misses               6412     6438   +26

@justusschock @Borda
Rename Lightning Fabric CLI (#19442)
609a9c8 
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Jirka Borovec <[email protected]>

(cherry picked from commit 2ed7282)
@github-actions github-actions bot added the fabric lightning.fabric.Fabric label Feb 12, 2024
@Borda Borda changed the title MInor correction release 2.1.2 [WIP] Minor correction release 2.1.2 [WIP] Feb 12, 2024
@Borda Borda changed the title Minor correction release 2.1.2 [WIP] Minor correction release 2.2.0.post [rebase & merge] Feb 12, 2024
@mergify mergify bot added the ready PRs ready to be merged label Feb 12, 2024
@lexierule lexierule merged commit e1e8770 into release/stable Feb 12, 2024
153 of 154 checks passed
@lexierule lexierule deleted the releasing/2.2.0.post branch February 12, 2024 19:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ethanwharris ethanwharris ethanwharris approved these changes

@awaelchli awaelchli awaelchli approved these changes

@lantiga lantiga lantiga approved these changes

@carmocca carmocca Awaiting requested review from carmocca

@justusschock justusschock Awaiting requested review from justusschock justusschock is a code owner

@tchaton tchaton Awaiting requested review from tchaton tchaton is a code owner

@williamFalcon williamFalcon Awaiting requested review from williamFalcon

Assignees
No one assigned
Labels
app (removed) Generic label for Lightning App package ci Continuous Integration data (external) litdata package dependencies Pull requests that update a dependency file docs Documentation related fabric lightning.fabric.Fabric package pl Generic label for PyTorch Lightning package ready PRs ready to be merged release
Projects
None yet
Milestone
2.2.x
Development

Successfully merging this pull request may close these issues.
8 participants
@Borda @lantiga @awaelchli @ethanwharris @lexierule @tchaton @cauyxy @justusschock